Skip to content

Conversation

@jaz1-nordic
Copy link
Contributor

@jaz1-nordic jaz1-nordic commented Nov 3, 2025

manifest-pr-skip

@github-actions
Copy link

github-actions bot commented Nov 3, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@7858281 zephyrproject-rtos/hal_nordic@564e754 (master,nrfx-4.0.1) zephyrproject-rtos/hal_nordic@7858281d..564e7541
mcuboot zephyrproject-rtos/mcuboot@aa4fa2b zephyrproject-rtos/mcuboot@c11e845 (upstream-sync) zephyrproject-rtos/mcuboot@aa4fa2b6..c11e845e
nrf_hw_models zephyrproject-rtos/nrf_hw_models@40403f5 zephyrproject-rtos/nrf_hw_models@5eec7ac (nrf4.0.0) zephyrproject-rtos/nrf_hw_models@40403f5f..5eec7aca
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@3e12b0c zephyrproject-rtos/trusted-firmware-m@c2f9edc (main) zephyrproject-rtos/trusted-firmware-m@3e12b0cc..c2f9edc7

Additional metadata changed:

Name URL Submodules West cmds module.yml Blobs
mcuboot

DNM label due to: 1 project with metadata changes

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@jaz1-nordic jaz1-nordic force-pushed the nrfx-8635_collab_merge_to_main branch 3 times, most recently from 1363560 to 15d0a9c Compare November 4, 2025 11:30
@jaz1-nordic jaz1-nordic force-pushed the nrfx-8635_collab_merge_to_main branch 3 times, most recently from 33f0666 to 016282a Compare November 4, 2025 13:46
@masz-nordic masz-nordic force-pushed the nrfx-8635_collab_merge_to_main branch from 016282a to 9f393db Compare November 5, 2025 15:57
@jaz1-nordic jaz1-nordic force-pushed the nrfx-8635_collab_merge_to_main branch 5 times, most recently from 2f91ae1 to 413a89f Compare November 7, 2025 16:41
@jaz1-nordic jaz1-nordic force-pushed the nrfx-8635_collab_merge_to_main branch 3 times, most recently from ca2a13d to da58048 Compare November 12, 2025 11:38
mstasiaknordic and others added 3 commits November 27, 2025 13:02
nrfx_uarte_rx is deprecated and will be soon removed.
Replaced by new API.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
(cherry picked from commit 40f07a0)
This is a subset of upstream's commit:
ccbc21b
to prevent dependencies on other boards.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
This is a subset of upstream's commit:
f2af86471220b4d269d006ad44c9a2bfe19f62aa
to prevent further dependencies.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
@masz-nordic masz-nordic force-pushed the nrfx-8635_collab_merge_to_main branch from 13560f5 to fea50dd Compare November 27, 2025 12:28
@masz-nordic masz-nordic force-pushed the nrfx-8635_collab_merge_to_main branch 3 times, most recently from 2567723 to dbc95cf Compare November 27, 2025 14:23
select NRFX_PRS

endmenu

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add

nrf-squash! [nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS

To the commit message? Is my understanding correct this is a follow-up to fe3a3d0 and the commits could be squashed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

masz-nordic and others added 14 commits November 27, 2025 16:52
nrf-squash! [nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS

- Remove temporary workaround for SDC in nrfx's reserved resources.
- Modify NCS reserved resources to use upstream version with additions
  instead of creating new file
- Align filename

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
File no longer needed, can be removed.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Update the HW models module to:
26ed181181eed53e400db8f63fa83c566a05d971

Including the following:
26ed181 54L CLOCK: Fix: Handle clock being stopped before it is fully
	started
b643b28 54L CLOCK: Account for relationship between PLLs and XO

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 4ef316c)
Update Zephyr fork of MCUboot to revision:
  d5b0dcb9aaee397fc105ae2228e8030038c3d871

Brings following Zephyr relevant fixes:

  - d5b0dcb9 hooks: Use dedicated type for slot numbers
  - cf138a0f boot: zephyr: config: Introduce MCUBOOT_BOOT_MAX_ALIGN
    Kconfig symbol
  - 677f1602 boot: zephyr: boards: delete frdm_mcxa156 configuration
  - 3c8e5717 zephyr: nRF54L05 and L10 configuration with LTO enabled
  - 4ea993ce zephyr: Remove duplicate zephyr module line
  - 8d14eebf boot: bootutil: Fix upgrade only serial recovery slot
    info
  - 78f87cf3 boot: zephyr: boards config of the variant stm32 disco
    kit
  - cbd3310e boot: zephyr: get base addres from dts for flexspi
    devices
  - 425e22be boot/zephyr: fix compilation errors in logging.
  - ec26273f bootutil: fix null pointer dereference in logging.
  - 3eb23a5d zephyr: Kconfig to control MCUBOOT_USE_TLV_ALLOW_LIST
  - a13624f0 bootutil: Add MCUBOOT_USE_TLV_ALLOW_LIST
  - e375252c boot: Enable Encryption with PSA + ECDSA
  - 21ed226f boot: bootutil: Fix bootutil_find_key definition
  - 763be6a5 imgtool: Add sha512 to allowed configurations for
    ECDSA256P1
  - 59d2f7a5 imgtool: Add support for VID and CID
  - 94ad4d44 boot: Add VID and CID checks

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 3cd292a)
Update Zephyr fork of MCUboot to revision:
  48b0f6da9af8d009eb8eafba023998a7d85320a1

Brings following Zephyr relevant fixes:

  - 48b0f6da imgtool: support producing images in test mode
  - 2b9f2a2f boot: zephyr: fix getting base address for certain
    boards
  - 028d80c3 bootutil: Move boot_enc_init in boot_swap_image
  - 15d43f20 zephyr: Deprecate MCUBOOT_VERIFY_IMG_ADDRESS
  - fd2c1428 zephyr: Added MCUBOOT_CHECK_HEADER_LOAD_ADDRESS
    Kconfig
  - 1035cc01 bootutil: Add MCUBOOT_CHECK_HEADER_LOAD_ADDRESS
  - 17a6ecd2 boot: bootutil: fix image_index definition
  - cc985298 boot: zephyr: Fix IO-based entrance method
  - 9ca08817 bootutil: Fix minor issues
  - 8a07053d bootutil: Fix log module registration
  - 5e1be19f boot: bootutil: write_sz fix
  - aed3fb95 docs: Add release note entry for
    MCUBOOT_BOOT_MAX_ALIGN Zephyr change

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 6f41b3e)
Update Zephyr fork of MCUboot to revision:
  b192716c969ad358bb3a1db60c898212f3275c55

Brings following Zephyr relevant fixes:

  - b192716c Revert "loader: Allow to specify slot number in
    version"
  - 5b7bccf9 boot: bootutil: swap_offset: Fix not including
    unprotected TLVs
  - ee9efe01 bootutil: Replace boot_write_enc_key with
    boot_write_enc_keys
  - 80a39c64 bootutil: Replace literal slot indexes with
    identifiers

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit fbdc8b2)
Update Zephyr fork of MCUboot to revision:
  96576b341ee19f1c3af6622256b0d4f3d408e1e3

Brings following Zephyr relevant fixes:

  - 96576b34 boot: zephyr: socs: stm32h7s7xx: Add support for
    ext_flash_app variant
  - 56538cf6 bootutil: Move update-independent code
  - fccd8905 loader: Move boot_get_max_app_size(..) API
  - 0248a023 bootutil: Move state-independent area APIs
  - f2d3f00a loader: Unify image check API.
  - dcc66e51 loader: Unify header_valid(..) API
  - 257265c8 loader: Optimize boot_check_header_erased(..)
  - 76e56e4f loader: Rename boot_version_cmp
  - 5311589b loader: Fix compile-time issues in loader.c
  - 606a1934 boot: zephyr: socs: add overlay & conf for
    stm32h573xx_ext_flash_app
  - 521fc0bf bootutil: Conditionally include mbedtls/ oid.h,
    asn1.h
  - 71b41e38 boot: zephyr: boards: remove nrf54h20dk overlay
  - 2fc1bd84 bootutil: Drop slot number and boot_state from most
    boot_enc functions
  - 1dd8ae60 boot: zephyr: rework stm32h750b_dk board overlay &
    conf

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit cd2079f)
Update Zephyr fork of MCUboot to revision:
  f3cc9476e233364031e9ab842290392f260fba82

Brings following Zephyr relevant fixes:

  - f3cc9476 updates for 2.3.0-rc1 release
  - 496f74f3 zephyr: Fix BOOT_DOWNGRADE_PREVENTION_CHOICE symbol
  - 6ab9afc6 boot_serial: Use boot_state_init where intent to
    initialize
  - e6fefac2 bootutil: Temporarly drop mem cleanup from
    boot_state_clear
  - 457be0cf bootutil: Fix some debug log format specifiers
  - f9ad3ee2 bootutil: Add API to lock HW counter
  - 6e602004 boot: bootutil: bootutil_area: Add debug for adjusted
    offset
  - 9d334f9b boot: bootutil: bootutil_area: Fix swap using offset
    min scramble
  - 76036133 boot: zephyr: Remove enable from beginning of prompts
  - d14ba22d bootutil: Fix encryption context de initialization in
    boot_state_clear
  - d8c4cc69 bootutil: Remove NULL state logic from boot_state_clear
  - 8ff6b678 bootutil: Use boot_state_init instead of
    boot_state_clear
  - dd4b01f4 boot_serial: Initialize state with boot_state_init
  - a312656b bootutil: Add boot_loader_state_init
  - e9255183 bootutil: Allow using psa_key_id_t in AES crypto
    context
  - 3af40a31 boot: zephyr: sysflash: Increase number of supported
    images
  - c27bb0f4 boot_serial: Use struct enc_data in
    decrypt_region_inplace
  - 0287fd4d boot_serial: Fix double boot_loader_state init
  - f846e9e9 boot: zephyr: Allow disabling default multiple RAM
    region file
  - 0ccce2f7 bootutil: In boot_swap_image add return check from
    boot_read_enc_key
  - 32b3c18b bootutil: Refactor boot_read_enc_key

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 8815841)
Use TF-M that has cherry-picked commits from upstream to fix compiler
warnings for MPS4.

Signed-off-by: Sudan Landge <sudan.landge@arm.com>
(cherry picked from commit ddb0da1)
Update commit id for trusted-firmware-m
to bring in support for nRF54LM20A/ns.

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
(cherry picked from commit e151273)
Bump TF-M to fix a linker error and address several warnings
when compiling for STM32H5.

Signed-off-by: Tim Pambor <tim.pambor@codewrights.de>
(cherry picked from commit 473d90b)
Update TF-M to include fixes restoring FOTA upgrade compatibility
between Zephyr v3.7.1 and v4.3.0. This fix allow both forward and
rollback upgrades.

Signed-off-by: BUDKE Gerson Fernando <gerson.budke@leica-geosystems.com>
(cherry picked from commit 9a45599)
Update manifest to align the copy of Mbed TLS header files which lives
in the TF-M repository to what's in Mbed TLS release v3.6.5.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
(cherry picked from commit e0fdb87)
New nrfx release contains major rework of nrfx drivers
instantiation making it easier to integrate with dts nodes.
Now, nrfx driver instances can no longer be `const`
because they contain driver runtime state.
Additionally, all nrfx drivers return `errno` error codes
instead of deprecated `nrfx_err_t`.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit ad1e5ac)
@masz-nordic masz-nordic force-pushed the nrfx-8635_collab_merge_to_main branch from dbc95cf to 0d0c63f Compare November 27, 2025 15:53
@carlescufi carlescufi requested a review from rlubos November 27, 2025 16:14
@carlescufi carlescufi merged commit 428ce9f into nrfconnect:main Nov 28, 2025
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.